HSV test

Factorize code

diff --git a/tests/hsva.c b/tests/hsva.c
index b98b9ef1eb4f23a27711e73cda6c1bb03d82a22e..d04172f9f2d2f1a3ff5a828d2e990b7417270419 100644 (file)
--- a/tests/hsva.c
+++ b/tests/hsva.c
@@ -60,51 +60,35 @@ main (int    argc,
 {
   int OK = 1;
 
-  babl_init ();
+  float rgba[][4] = {{    1.0,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   0.5, 1.0}, {  0.0,   0.0,   0.0, 1.0},
+                    {   1.0,   0.0,   0.0, 1.0 }, { 0.75,  0.75,   0.0, 1.0}, {  0.0,   0.5,   0.0, 1.0},
+                    {   0.5,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   1.0, 1.0}, { 0.75,  0.25,  0.75, 1.0},
+                    { 0.628, 0.643, 0.142, 1.0 }, {0.255, 0.104, 0.918, 1.0}, {0.116, 0.675, 0.255, 1.0},
+                    { 0.941, 0.785, 0.053, 1.0 }, {0.704, 0.187, 0.897, 1.0}, {0.931, 0.463, 0.316, 1.0},
+                    { 0.998, 0.974, 0.532, 1.0 }, {0.099, 0.795, 0.591, 1.0}, {0.211, 0.149, 0.597, 1.0}};
 
-  {
-  {
-    float in[][4]   = {{    1.0,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   0.5, 1.0}, {  0.0,   0.0,   0.0, 1.0},
-                        {   1.0,   0.0,   0.0, 1.0 }, { 0.75,  0.75,   0.0, 1.0}, {  0.0,   0.5,   0.0, 1.0},
-                        {   0.5,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   1.0, 1.0}, { 0.75,  0.25,  0.75, 1.0},
-                        { 0.628, 0.643, 0.142, 1.0 }, {0.255, 0.104, 0.918, 1.0}, {0.116, 0.675, 0.255, 1.0},
-                        { 0.941, 0.785, 0.053, 1.0 }, {0.704, 0.187, 0.897, 1.0}, {0.931, 0.463, 0.316, 1.0},
-                        { 0.998, 0.974, 0.532, 1.0 }, {0.099, 0.795, 0.591, 1.0}, {0.211, 0.149, 0.597, 1.0}};
+float hsva[][4]  = {{      0.0,   0.0,   1.0, 1.0 }, {    0.0,   0.0,   0.5, 1.0}, {    0.0,   0.0,   0.0, 1.0},
+                    {     0.0,   1.0,   1.0, 1.0 }, {   60.0,   1.0,  0.75, 1.0}, {  120.0,   1.0,   0.5, 1.0},
+                    {   180.0,   0.5,   1.0, 1.0 }, {  240.0,   0.5,   1.0, 1.0}, {  300.0, 0.666,  0.75, 1.0},
+                    {  61.796, 0.779, 0.643, 1.0 }, {251.130, 0.887, 0.918, 1.0}, {134.919, 0.828, 0.675, 1.0},
+                    {  49.459, 0.944, 0.941, 1.0 }, {283.690, 0.792, 0.897, 1.0}, { 14.341, 0.661, 0.931, 1.0},
+                    {  56.909, 0.467, 0.998, 1.0 }, {162.413, 0.875, 0.795, 1.0}, {248.303,  0.75, 0.597, 1.0}};
 
-    float out[][4]  = {{      0.0,   0.0,   1.0, 1.0 }, {    0.0,   0.0,   0.5, 1.0}, {    0.0,   0.0,   0.0, 1.0},
-                        {     0.0,   1.0,   1.0, 1.0 }, {   60.0,   1.0,  0.75, 1.0}, {  120.0,   1.0,   0.5, 1.0},
-                        {   180.0,   0.5,   1.0, 1.0 }, {  240.0,   0.5,   1.0, 1.0}, {  300.0, 0.666,  0.75, 1.0},
-                        {  61.796, 0.779, 0.643, 1.0 }, {251.130, 0.887, 0.918, 1.0}, {134.919, 0.828, 0.675, 1.0},
-                        {  49.459, 0.944, 0.941, 1.0 }, {283.690, 0.792, 0.897, 1.0}, { 14.341, 0.661, 0.931, 1.0},
-                        {  56.909, 0.467, 0.998, 1.0 }, {162.413, 0.875, 0.795, 1.0}, {248.303,  0.75, 0.597, 1.0}};
 
+  babl_init ();
+
+  {
     CHECK_CONV("rgba to hsva ", float,
         babl_format("RGBA float"),
         babl_format("HSVA float"),
-        in, out);
+        rgba, hsva);
   }
 
   {
-    float in[][4]   = {{      0.0,   0.0,   1.0, 1.0 }, {    0.0,   0.0,   0.5, 1.0}, {    0.0,   0.0,   0.0, 1.0},
-                        {     0.0,   1.0,   1.0, 1.0 }, {   60.0,   1.0,  0.75, 1.0}, {  120.0,   1.0,   0.5, 1.0},
-                        {   180.0,   0.5,   1.0, 1.0 }, {  240.0,   0.5,   1.0, 1.0}, {  300.0, 0.666,  0.75, 1.0},
-                        {  61.796, 0.779, 0.643, 1.0 }, {251.130, 0.887, 0.918, 1.0}, {134.919, 0.828, 0.675, 1.0},
-                        {  49.459, 0.944, 0.941, 1.0 }, {283.690, 0.792, 0.897, 1.0}, { 14.341, 0.661, 0.931, 1.0},
-                        {  56.909, 0.467, 0.998, 1.0 }, {162.413, 0.875, 0.795, 1.0}, {248.303,  0.75, 0.597, 1.0}};
-
-    float out[][4]  = {{    1.0,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   0.5, 1.0}, {  0.0,   0.0,   0.0, 1.0},
-                        {   1.0,   0.0,   0.0, 1.0 }, { 0.75,  0.75,   0.0, 1.0}, {  0.0,   0.5,   0.0, 1.0},
-                        {   0.5,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   1.0, 1.0}, { 0.75,  0.25,  0.75, 1.0},
-                        { 0.628, 0.643, 0.142, 1.0 }, {0.255, 0.104, 0.918, 1.0}, {0.116, 0.675, 0.255, 1.0},
-                        { 0.941, 0.785, 0.053, 1.0 }, {0.704, 0.187, 0.897, 1.0}, {0.931, 0.463, 0.316, 1.0},
-                        { 0.998, 0.974, 0.532, 1.0 }, {0.099, 0.795, 0.591, 1.0}, {0.211, 0.149, 0.597, 1.0}};
-
     CHECK_CONV("hsva to rgba ", float,
         babl_format("HSVA float"),
         babl_format("RGBA float"),
-        in, out);
-  }
-
+        hsva, rgba);
   }
 
   babl_exit ();